Further changes to try to get monitor tests running in jenkins