Updated to allow force rebuilds of nightly tests