Add tests for sa proposal

Involves removing some unreachable code and properly handling sessino
state.