Try to get the tests working