WIP - Refactored/Extracted methods testing green. Comments out breaking code. Test failing. Exception not being thrown.