code chore, test shred fix, microoptimization