Fixes save() overloading problem + test update
Compiles better when the files are committed...