Fix unit tests, make requirements more flexible, bump major version

Should there be a `return` on this line?