test suite: adapt #350 implementation
test suite: adapt for #350 implementation