Remove Q as dep, slightly improved test coverage