Putting correct nonstructural annotations into the test suite; fixing bug with gamma sampling.