Fix tests
Do not require layout