Fixed bugs on test page