added comments in tests, simplified test cases