Removed unused Interactor
Refactoring & extra tests
Fix bug highlighted by JRuby