Deleted unnecessary test header files, fixed lints.