Classes style & tests fix