Merging two tests into one