Some updates and integration tests