Namespace classes, update tests