dyveto bugfix, lots of tests