Update tests for new tags