Companion controllers take an extra 'master' attribute to associate
them.

Also add tests for this