Refactored tests and disk_track class