Cosmetic changes.
Adding missing unit tests.