Add test and html changes