Update tests to not be as dependent on section numbers.