Updated latest changes in algorithms code, test suite and UML