Fix errors which caused some unit tests failed to compile.

Fix errors which caused some unit tests failed to compile. #538