21-5-2014

LiuZhe - new tests added