BATCH-2040: Added unit test, fixed missing import