Edited the master UML and added test cases

Test cases aren't implemented yet.