fixes bug 982742 - fix tests from regression

@rhelmer r?

Feel free to merge if you r+ and it passes leeroy