fixed more integration tests