Adding more decomission states

- Addressing #354 
- Cleaning up decommission code
- Adding decommission tests