Fix for service_tests and test_scripts - follow-up on inter-dependent problems which prevented saving them. See commit 2ceac3967604170ea4e7e1cb33c7dcc6a08180e2 for more details.