Renamed unit tests and added a functional test