* Add test * Add fix * Add extra test * Remove package imports on discovery for Python versions < 3.6 * Move wiring samples to a different directory