Improve code doc
Singleton tests