Adding a couple behaviors for convenience in tests

Change-Id: I91081cb1306d129c5d0bedf8b473199d92b895e6
Merge branch 'cloudkeep_working_secrets' into cloudkeep_jenkins