The tests are less reliant on tags