Started work on track() tests