added testing via Supplier
a few updates