Improve and reenable test.