Update so each test has it's own for verbosity. Also check for go test -short and skip the longer tests.