fixed tests and permenetly reverteed load all feeds code