Starting to splits tests off into their own directory