Update init order and tests