cdd2a37 test:Better tests.