Made tests/run-tests.sh safe to Ctrl-C.
(minor test fixes)
Added fillInByLabels()