blarg, fix tests