* Added TestSuite
 * More dependency injection
 Added test suite.