refactored unit tests into MSpec