Unit tests
Minor changes