Test fixes for Linux build