Updated unit and acceptance tests for aelx311 and m12