Namespace classes
Update tests