more tests
makes tests more readable
improves test descriptions
Merge branch 'hilary-beta'