fix broken tests, remove explicit this.