Minor additions to atrac test