new unit tests
Renamed method