changed the folders
added the files again
moved all of the tests into one main function