added testcases
making it possible to shut down the server
merged with develop
merged Junits into the feature tree
Merge branch 'feature/junit' into develop