CLC-3178 - Fix tests

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