Added two more unit tests
Renamed tests