Update readme and tests