Added test and worked on singleton