BISERVER-8811 - Fixing unit tests
Merge pull request #371 from rmansoor/master

 	BISERVER-8811 - Fixing unit tests