Merge pull request #245 from csmith/master

Really minor tidying.
Remove moved classes.

Stab bits of ignored tests that no longer work.