Next gen 14 17 acu179906 go through unit test and fix them