fix unit test, partially reverting fc86ca0ca9df73934ffc09c4539b6fe8e465acdf