Fixed tests to work and checked for UML correctness