Refactored test to allow for easier test case writing.