all the tests are now generic