fixed unit tests and added some more