update based on usage in clamshell
fix tests
Merge pull request #3 from tidepool-org/jhbate/changes-for-edit

Jhbate/changes for edit