renamed and merged tests