VP-211: Adding more structure to the UniSub component. Changing integration test to reflect that. Also removing timeout from the integration test.