COOPR-510: Updated feature code according to comments from thr PR; Created base classes for unit testing.