Fixed some inconsistencies and typos in test suite.