Fix table name for test
Merge branch