Fixed unit test
Cleaning up tests