Improve tests; start working on tag categories