Update tests to use proper naming of destinations