Corrected #includes.
Corrected test cases.