more refactoring on the classes born under Tracking and fixing specs