Rejigging the tests folder so it's actually organized like the source
packages