Fix bad merge on load method. Test load method.