Add @InWindowScope, tests are still missing