Fix trivial test bugs