This patch merges two different tests into one to speed up the entire
testing process. Then it improves the merged code.
Signed-off-by: Federico Vaga <federico.vaga@cern.ch>