Refactor/simplify tests.