[OLINGO-324] modify context type detection and first tests for this II