rewrite level tests to new style