remove bit-rotten tests
Merge branch 'remove-rotten-tests'