Fix bug
Remove useless spaces
Add unit tests
Fix namespace of unit test classes
Validate tracker id
Rename variable