Renamed some tests and updated README