Minor fixes. Couple more tests.