cleaned test suite for #384 hotfix