[BUG][FIX][TEST] ClassBuilder does not move iVars correctly