Remova Singletonitis, fix unit test