Removed unnecessary include files, removed commented lines, fixed header for test files.