More integration updates and testability improvements.