Update/simplify tests.