#57 tests simplification complete