Fix compiler warning and add missing includes in unit test environment

Fix compiler warning and add missing includes in unit test environment #632