fixed some more tests and added new ones