Fix some code
Fix test builder