REFACTOR: modified apigen tags, modified tests and built them, some extra pages from Thursdays meeting