Update tests to work with new layout.