Fix tests

Make tests pass
Update readme