Test fixes to resolve some cases where projects were left behind