Make `hookup` work with the class it's called on. Unit test changes.