Added Rainer's identifiers also dependencies.
SP test improvement