added new html format, fixed misc tests that were broken