Small Refactorings
Added Tests
Bring up to date
Missing options for transport