Elaborate integration tests and removed unnecessary object creates.