Recreated load/unload, Added tests