Merge branch 'master', remote branch 'upstream/master'
add tests and fix for issue #12
Make erroneous save test more explicit