Fixed tests
Added loading stuff