Little fixes in cli build tests