fix compile error
untabify
fix build of test_normal.cpp