changed naming in testing cases