test.html -> index.html, and some housekeeping