Fixed some issues with uncountable tracking and wrote simple tests