Testing branch

Set up functioning testing files, but need to write my tests.