Missed a few more unit tests and sample_space modifications.