Merge "Bug 1254 - Added unit tests"