Test fixes for Solaris
Merge pull request #204 from mhaskel/content_not_contain

Test fixes for Solaris