Adopted tests to new BitVector and improved labeling