Fixing all tests to work under new scheme