Renamed some tests and added another regression test