add tests
Merge branches 'test' and 'master'