Added state obj. New tests