[EAGLE-417] Fix unit test failure on develop branch Author: Hao Chen <hao@apache.org> Closes #305 from haoch/EAGLE-417. (cherry picked from commit c0b90247214949410925d95de1ae562ce1299c80) Signed-off-by: Hao Chen <hao@apache.org>