More CarPark tests and fixes