Simplifying code in a few more tests, shouldn't be any logical differences.