Minor changes
Test