Backend tests now pass.
Merge pull request #137 from xi-project/backend-fixes

Backend tests now pass.