Simplify some bit vectors
Add known answers to testbench