Test fixes for Solaris