Unused, removed from project
Refactored unit tests