Fix tests for ns.layout