Merge "Unit test fix"