Updates to tests, related to #94 but not really required for the change to be effective; just test updates for consistency.