Fix tests, enqueue new tracks