Test fixes for mono