Refactored unit tests to kick goblin out