Fix tests to use new layout