LCO-659 LCO-660 LCO-661 adding tests, refactoring, adding get option
Merge branch 'LCO-658_addingGetOption'