Add test for completion and tweak code
Add test for completion and tweak code

pombredanne/Bookie,GreenLunar/Bookie,adamlincoln/Bookie,bookieio/Bookie,adamlincoln/Bookie,GreenLunar/Bookie,adamlincoln/Bookie,pombredanne/Bookie,pombredanne/Bookie,teodesson/Bookie,skmezanul/Bookie,bookieio/Bookie,GreenLunar/Bookie,bookieio/Bookie,adamlincoln/Bookie,skmezanul/Bookie,bookieio/Bookie,wangjun/Bookie,charany1/Bookie,skmezanul/Bookie,skmezanul/Bookie,wangjun/Bookie,teodesson/Bookie,wangjun/Bookie,teodesson/Bookie,teodesson/Bookie,wangjun/Bookie,charany1/Bookie,GreenLunar/Bookie,charany1/Bookie