Increase test coverage through minor refactor