Modified a couple tests to be more assertive.