new test set, add a couple sources to behave
fix test set
final test set tweaks, data frozen