Fixing tests; one fails; still: ready to merge to master, yeyy