Harden up specs and fix context based selection