Update tests to match fixtures, add comments