Aligning Basic Usage and Testing examples to be drop in friendly