Delted test suite.
Misc cleanup.