Readme and tests extended