QQ more tests and cleanup.