Retirement tax questions

That's what I assumed.  My answer does not change.  This is money that wasn't eligible to be in the plan because of the ADP test failure, so you are not allowed to treat it as if it was eligible to be in the plan.