adjust tests for #541
Reasonable solution for #541