Refactor deps

So that test and build aren't separated by too much
@evansde77