Add more tests
Add migrate test