Renamed test file and added tests