Added testing + tracking