Restore the old version of ETupProject, which brings the passing tests to 41 for DynamicAcc2.
Also fix the order of args to assertEqual in the tests.