CLC-3816 More test coverage and tiny bug fix for smart_fetch

https://jira.ets.berkeley.edu/jira/browse/CLC-3816