merge in tests from master branch