Changes to finding keypoints and some testing files.