anchor.diff:        .then((ProcessResult pr) {
           expect(pr.exitCode, 0);
   
  -        return _validateDirectory(tmpDir.dir, _testLibName, _testLibVer);
  +        return _validateDirectory(tmpDir.path, _testLibName, _testLibVer);
         });
   }
   
  -Future _validateDirectory(Directory dir, String libName, String libVer) {
  -  var expectedMap = _createLibValidate(libName, libVer);
  +Future _validateDirectory(String packageDir, String libName, String libVer) {
  +  var libraryPaths = _getLibraryPaths(packageDir, libName, libVer);
   
  -  return IoHelpers.verifyContents(dir, expectedMap)
  -    .then((bool validates) {
  -      expect(validates, isTrue, reason: 'Directory structure should be valid');
  -    });
  +  expect(libraryPaths, hasLength(6));
  +
  +  return _validateFilesExist(libraryPaths);
   }
   
  -Map _createLibValidate(String libName, String libVersion) {
  -  final rootDir = 'dart_${libName}_${libVersion}_api_client';
  +Future _validateFilesExist(List<String> files) {
  +  return Future.forEach(files, (filePath) {
  +    var file = new File(filePath);
  +    return file.exists()
  +        .then((bool exists) {
  +          expect(exists, isTrue, reason: '$filePath should exist');
  +        });
  +  });
  +}
   
  -  var expectedMap = {};
  -  expectedMap[rootDir] = new EntityExistsValidator(FileSystemEntityType.DIRECTORY);
  +List<String> _getLibraryPaths(String packageDir, String libName, String libVersion) {
  +  final name = '${libName}_${libVersion}_api';
  +  final libDir = 'dart_${name}_client/lib';
   
  -  return expectedMap;
  +  var files = [];
  +
  +  files.addAll(['', '_browser', '_console']
  +    .map((k) => 'src/cloud_api${k}.dart'));
  +
  +  files.addAll(['console', 'browser', 'client']
  +    .map((k) => '${name}_${k}.dart'));
  +
  +  return files
  +      .map((f) => pathos.join(packageDir, libDir, f))
  +      .toList(growable: false);
   }
   
   final Matcher _hasUsageInStdOut = predicate((ProcessResult pr) => pr.stdout.contains("""Usage:
  
positive.code: import 'dart:io';
  import 'package:unittest/unittest.dart';
  import 'package:bot_io/bot_io.dart';
  import "package:discovery_api_client_generator/generator.dart";
  
  const _testLibName = 'discovery';
  const _testLibVer = 'v1';
  
negative.code:       .then((bool success) {
          expect(success, isTrue);
  
          return _validateDirectory(tmpDir.path, _testLibName, _testLibVer);
        });
  }
  
  