multiple small changes to in tests that were needed after deploying them on jenkins.
@godfryd can you look at this?
