Expand test page functionality, remove comments