#170, removed changes from other tests, instead replaced with a central change