Modified unittest