Improve integration test and data validation