minor corrections for running in test runner