Fix a broken test, remove a duplicate one