Add html output and Test