Fix skipped test.
Fix code style.