Fixed tests broken by method changes