Fix some indentation, fix types' traits and don't use alias templates.
change naming and test handling