[misc] Fixed test
[cleanup] Improved codestyle