Removed a few un-needed test dependencies and updated others.