unconditional -> if ( for exception )
Refactored the ifs
Refactoring to allow new test
Refactor to allow reuse
Added test for addition
if -> while