Added more singleton examples and they tests