file-pull fixes, begin testing