cleaned up dead code, and wrote additional xstream test
Merge branch 'master' of github.com:akuntamukkala/integration