Added timeouts to FeaturePointExtractorTest

+minor cleanup in FeaturePointMatcherTest