Refactored first test and wrote three more; all passed.