Added more tests, starting to set up paths