Bug-22184 - Fixed unit test failures on Solaris that required a casting.