Fixed tests. cc @markrickert