More work on test setup