minor: remove @s added by search and replace

meant to move id -> @id, also turned identity in the test titles into
@identity.
fix controller refactor and features

Also save debug log on failing features