Change tests and REQUIRE to work with 0.3-