New tests
Minor changes