Simplifying tests!