more decommission changes (test)
more tests and some bug fix

- still missing logic, expected failures