Test fixes for path problems