Adding test for AUTO-384 (ready for review)