Concurrency fixes and finalizing connection acceptance test