Merge "Add basic test suite for usc"