Add tests for singleton and combine.
White space fix.