Refactored unit tests
Reorganized unit tests and fakes