adds tests
Merge branch 'add-tests'