fix tests, isolate keywords in component,
yield back controller and keywords in addition to context