Updated tests, refactored for clarity.