refactored the cascading flow in order to be more flexible
improved mapping definition of the criteria index
reviewed the way to assert the expected results