Fixes code style and last python3 unit test.