Alias this.subject as this.it in Test class, style fixes