WIP: all tests (but drop) passing again, need to fix that and valgrind next.