Change test cases to be more "fun"!