reverted test breaking part in commit  e628bc70e73d02a4d40913f44b38e7606829adab