Added more tests to Driver; fixed grammar, etc.