Update testing code, fix #33.