more tests
Merge branches 'master' and 'refactor'