bugfix; Uncomments-out the commented-out test cases.