Improve state test.