Adds missing singleton tests
Less magical naming

Adds missing singleton tests

Updates direct value metatag