Add functional tests for singleton support