Tests case improvements