moved integration test to a dedicated file
fix some tests