BATCH-2003: Updated tests and removed unused adapter