Fixes test cases to appease master jenkins