Refactored unit tests
Latest build