Refactored test attributes to support mk2 detection