Initial version of Save tests
Included file missing in previous commit