add tests
Merge branch 'add_tests'