Made integration test more real.  Updated implementation accordingly.