Merge branch 'pt/am-tests'