Corrected #includes.
Corrected test cases.
Merge branch 'lint'