Readme and test enhancement