Better(more loosely coupled) version of track session + new tests