Improve testing patterns for funds retrieval