Remove broken unit scripts
Fix broken test cases