Changes to track and tests
Work towards implementing building conf tracks