Added new load/unload methods, and refactored tests