add more tests
Merge branch 'add-more-tests'