#14 refactored test data