Test fixes as part of #52