Simplify tests and remove unused properties.