Adjust buildtest e others thinks