I had forgotten to refactor the packaging on the test side. Added some more
testing and moved things around.