Refactoring towards completely unit tested project