Added more robust handling of test includes, and to provide backwards API compatibility for Ceedling