Cleanup Deferred FileAPI, Start to write Deferred FileAPI tests