Reverting auto_test to the pre-bit-vector implementation