Retagging acceptance tests, removing folder tags