Merge "Bug fix for failing test. Process start times out due to long sleep time, which should only be done for wedge." into main