merged two tests