More convenient check for context

Also, I have 20 test failures om my machine, that are not depend on this change