Added load/save test