Corrected test header include paths.
Corrected calling callbacks.