Refectoring to make testing edge cases easier
Fixing test, ignoring another failing one