Backport removal of running program from testsuite.
Rejigger definition locations.
Fix compilation, pass tests.
Prepare for Travis testing.