Simplify some tracking test function names
Add tracked files to git index