Update more tests after luna rename