adding 2 missing mercurial files
unit tests
merge with origin