Fixed all existing tests for load, and completed full merge integration