New integration test organization

Added row id test