replace some feature tests with more local tests