Additional changes to tests and main html file