#1461: Improve test