:wrench: Fix #3 - Handle nulls explicitly before doing a for each on lists, new tests and :shower: cleanup