Update readme file, prepare for an update
Update tests