replace contextFolder with contextFolders & fix failing unit tests