Merge branch 'sb/am-tests'