Update tests for new context struct