test loading fixes