fixing loaders - tests working