Add more unit calls
Merge branch 'Vahe's-Awesome-Branch-of-Crazyness' of https://github.com/guehochoi/TFSProject into Vahe's-Awesome-Branch-of-Crazyness