More tests; work on intercept output