Fix minor atest formatting issues. Separated these changes from PR #1776