Added DishTest and corrected other testes