Improve loading mechanics. More tests.