Fix test

Fixed few failing tests from latest jenkins run..I didn't squash all commits as the commit message includes what tests I've fixed.