Fixed unit test not passing
* Removing old test fixture
Improved fixtures