uml and updated tests