dammit jan
Merge branch 'master' into jan
Added a test where we attempt to delete non-existant data.
merged jan branch