tests: fix tests in order to work with both layouts.