Add some tests and a new context.