added mockito to mock some objects, improved and added tests for e.g. the visitor pattern, finalised some variables