Adding more unit tests for - TRUNK-4134