add more integration test
fix specs
merge branch level