AllTests_NoApi working after merge from SF