Updated tests and managed queuing concurrent requests