Removed redundant models, and updated the class diagram to reflect the changes to the code. Cleanup of test code different places in the program