API success checking and large test restructuring