modified test to new arch