Updated tests to reflect new tags placement