added som UMLets
merge
fixed some tests
deleted unused tests
merge
Merge branch 'Jonte'