refactoring, improved load strategy tests