Added test cases and files for tracker