Fix ECL test failure
Fix FB test failure
Fix LUV test failure