CSG1132 A2: added more tests