renamed and added tests