more loading fixes and more tests