Improvements to Test Build System - added option to test file tracking or not, and moved wait function to part of the callback interface.