Modified init()
Modified unittest