Rebase test from dynamic acceptance process in server

This patch aligns the adapter with the current server behavior.