change wording in test cases
cleanup and comments