Fixed some bugs and added some test