Commit to do merge
Necessary stuff
Merge branch 'master' into jan
Finished the deletion unit tests.
merging