Some build fixes. Add test data.