migrate more tests