Merge "Unit test base"