Refactored client code and test to consume XML

Removed unused constants

Change-Id: I7a965a498ab4607de145359697b7d5d976aaa4ff
Fixes: bug #1154300