watch out for sampling issues
(#601)
Working high-res unit tests
(#601)