Test data now includes BodyStyle

Test data creation is in single place.