(one of my goals w/the big rework is to better compartmentalize the tests)