Added additional tests for restructuring
Added tests for removing corpses