Fixing style and user tests.