CYB-309 Fix leaky state in several specs

https://jira.ets.berkeley.edu/jira/browse/CYB-309