fix test data, fix validation