Everything is somewhat tested

All works we think