Update tests. Fix nulls in utils
Release 1.0.2