fix tests up a bit