Add NBI integration tests