more refactor tests
Merge branch 'master' into tests