Server - improve test controller, user async.map