Updated test suite to use new tests directory