Test case enhanced