Simplify fixed and tested