fixed double underscore issue
added unit test for double underscore issue