Added in context to the tests