Re editted test cases in order to support new calsses