Add tests
Merge branch 'master' into fixtests