Added complete track wand & test