Build & deployment improvements

Add rollback unit tests