Test fixes for ci