BS-11866 Added UnitTests