Adapts tests due to reduced number of tags