Fix tests for Solaris