Additional tests
Minor changes
Format