update references and declare one missing global variable
revert version for SOL013 refs and update SOL002 refs for Notificationtests