Check for context param and added tests