Adjusted namespaces of reference tests to fit logical structure