merge test setup changes