Trivial Modifications in the tests