Refactoring some code and fixing some integration tests failures.