Completed Integration Test 2A

Also updated CarButtonControl and unit tests