Added Singelton in unit test