Reimplemented Track2 to match Track1 approach,
Implemented a more extensive UT for Track2,
Fixed typo in Track1