Simplified integration, made tests pass