Preperations made to enable testing

My codebase ended up a little larger than I originally expected