Add test for sample addition
Remove make_sample_16

Replace it with something at the encoding stage?