Removed loaded logic
Fixed tests
Merge