Update Each definition to simplify imports and start defining examples as unit tests