adjust tests to new code in 46bed49567f96f5e45f36236acac66cf9b3a9374