added more test stuffs