refactoring and added test for simple OT scenario (not yet passing)
Wikipedia Example passes!
refactoring / cleanup