BATCH-2003: Finished unit tests