more tests
Merge branch 'hilary-beta'