derp - MCMC doesn't need likelihood-weighted samples.
also added a couple of tests for likelihood-weighted expectation.