More cosmetics, more parametrized, more tests friendly