Put test classes in their own directory.
Merge branch 'master' into fit-modular