Remove Q as dependency, slightly improve test coverage

These are breaking changes.