Test suite cleaned up so it all passes.