BATCH-2149: Updated unit tests to demonstrate functionality