Add support for multiple SF build steps in one job
Make sure process we are waiting for is still alive
Fix failing test