[behdad] Add more test data
[behdad] Speed things up a bit by using slots