Renamed tests and added an additional test