Simplifying "load" method.
Fixing tests.