Set up testing framework

Moved some files around which cause a lot of deleted/new