Refactored some test code to make it more elegant.