Improve entry test.