update init. logic and tests