Simplify test and fix genfdt test