adds more tests, fixes more problems in test driver