Small changes + 2 new tests.