Removed magic constants and 16 test vehicles.