Fixing issue with server requests, adding tests around asset containers