Test fixes for hw branch