Fixed up some CarPark tests, added more

Up to 13 now, but I think it will probably end at about 40-50