Issue #2385181 follow-up: fixing the tests
Issue #2385181 follow-up: Fixing the message regarding block placement and adjusting the test