Fixed wrong include paths.
Removed old test code