Fixed dealing method and tests
Minor changes to tests