Cosmetic changes.
Updated general test.