Changed track to track_no, fix code, add tests

Added testcases for track and count