Refactored the two recently fixed tests.
Fixed merge conflict by using Sebastian's changes instead of mine.