Updates for testing and uml

Removed stuff that was unnecessary