adding more tests and removing html generation