improving comments and a test-case