First commit

Bla...
Fixes

Test fixes