Updated Payment schema; updated tests.  Fixes #121.