rewrite tests according to the new structure