Added tracking and tests