totally fixed unit tests