Some more tests
Merge branch 'v1'