add more integration test
fix specs