Fixed some tests broken under renaming