Slightly modify tests

These should be fairly minor changes to the tests that do not have any change in behavior.