more test data
data + makefile cleanup