Fix tests regarding #16