fix tests
closed #1318
fix test data
closed #1317
closed #1316