More tests.
I think i'm too bad to implement the new protocol :(