#99 New refactoring - Replace use of String's indexOf() / lastIndexOf() with contains()

Implemented with test samples