Finish fixes to testpage-1