Added Exception stuff, two more Treachery tests