Added unit tests.
Added integration tests.
Merge ../xo-titan