Assigning TODOs to self.
Renaming all expected exceptions "expected".