XD-978 - Adding Tests
XD-978 Adding Tests
Merge