Minor fixes, awaiting upstream release and refactored tests.
Cleaning up non-relevant items before alpha release push.