Finalised coding and testing for vehicle class hierarchy