Add multiple session support to Simple Tests