Updated tests to work on the supported platforms.
Tweaked to work on smartos and solaris.