#545 tests fixed