Added a missing argument validity check to e_swap()
Reorganized tester.cpp to support multiple test options. Commented out some debug dumps. Tested some changes made in Vehicle.