Renamed tests
Small changes.