Bad tests didn't break. Manual tests found errors.
Merge pull request #23 from xi-project/bad-test-fixes

Bad tests didn't break. Manual tests found errors.