AUTO-867-868-tests (ready for review)