fix unit tests for integration