Update specs to incorporate attacking attr foreign reference

Also a few other small test fixes