Very very true. The last task of this PR was to move tests into the unit level and I hadn't done that as of yet just to be sure that any other nitpicks were made before that point.