Inject the devices

Update version

Style Tweaks, drop static tests;