Refactord API for clarity + Started testing TrackReader

Not sure how to test Tackreader though