Build & deployment improvements

Moved testing for deployment branch into gear (still need to update the
build lifecycle tests)