renamed and added tests per #766