fixing and simplifying tests