Minor changes
Some tests.