new version works on tests, but requires adaptation where it is used