Remove redundant context
Fix test suite