Added Tests
Merge branch 'master' of https://github.com/mihai-chezan/xpress.git

Conflicts:
	pom.xml
Merge branch 'master' of https://github.com/mihai-chezan/xpress.git
Merge branch 'master' of https://github.com/mihai-chezan/xpress.git