Cleanup code
Deleted unnecessary and duplicated
Renamed test