Improve test page