add tests of private methods
Merge branch 'work'