adding test cases and aesthetics for phase2