Fix failing tests

@aduggin