Fix readme and updated tests