Tidied up CarPark tests and added more