Better variable encapsulation
Uses environment variables if avaibable.
Uses environment variables if avaibable.
Fixed missing image
Removed mock