Update tests, other integration with feature retrieval.