Fix use of this.
Fix tests.