#4 #time 1h 30m Fixing naming and cleaning up state specs