Merge "Add UTs for remaining methods"