Bug fix and update test page