New tests
...
Ehh
what
merged
dammit brett
Commit to do merge
Necessary stuff
Merge branch 'master' into jan
Finished my tests
Merge branch 'master' into amazingbranch
Finished the deletion unit tests.
merging
Changed deletion tests slightly
yeah
Added non-functional
oops
Added gcov files
derp
no