[54] [Ian] more renaming and refactoring to push out methods
[54] [Ian] adding more tests to cover untested behavior at the unit level