cleanup of tagmodule - improved test coverage