Updated so tests are in the root directory