Cleanup.
Added $OPTS to make it easy to specify options (e.g. "-j 1") for test runs.