Back to ndepend

Methods refactored should be tested - Code Coverage