test cases and edex tool fix