some refactorization for allowing context variables on rebase
added include case on context tests