Renamed some things and re-wrote a test