Term layer + tests
GenHTML is getting more shoddy, but now it includes support for terms