fixed unit tests; all working