Fixed some bug and remove from test