Add some missing singleton class specs