tests for new methods
Merge branch 'dev'