Code style migration in tests
Code style migration in the lib