Fix bug
More tests