Make "includeBase" an option instead of part of context; add test