code clean up add test for efi