Added class diagrams. Test data fixes