Merge #120, #123, #124 into live-tests

This integrates #120, #123, and #124.