Merge "Raise unit test coverage over 50%"