Fix (really) tests regarding #16