renamed and updated tests