Lets simplify the tests