Rename 'test' to 'tests'
Merge branch 'master' into geezer