Re-worked test cases.