Simplify code a bit, fix tests
If no peer checksum again goes to fifo