Added tag category test

Added tag category test
Latest upstream, as of yesterday.