Updated readme
More tests, changing some exception types around