Fixes up some more test attributes