Renamed test file to so that it occurs next to the file it tests