add a singleton instance for convenience
clean up test descriptions