WIP 4 Test: Additional test, and test refactor