Added context to tests