Add more tests
Minor changes in tests