US538: Added Functional tests