Enhance test and readme