Significantly improved blockmodes tests