split install lines, to keep sane
Add more test dependencies