Added context tests, minor trivial ones, and refactored the tool instantiation into a second role, as this ought to be a better interface. More refactoring needed here to clarify the boundary.