Use new expect syntax in unit tests
Use let in integration test