Modified tests to remove redudancy.