Fix build issue
Prepare to test