Fix broken integration test
Unit test