modified test cases acc. to Johns review comments