Add some test data, clean up and put into packages