Added some more tests and test html files