Removed singleton instance.
Fixed tests.