Least invasive changes to fix handler tests

They all pass *except* the diff test/s as the diff operations haven't
been implemented in the PG storage implementation. These tests need to
be reworked to use the API when we get the in-memory storage done.