Fixes to tracking test & general cleanup