Fixing the tests so they will run