Zack's cleanup changes
refactoring all the thruster characterization tests to make easier to read