added test page
merge master