Replaced QueuedAction with CommandQueue.WhenDone, tests passing