Refactor test and fix them
Refactor test and fix them

frundh/nomad,kmalec/nomad,novilabs/nomad,kmalec/nomad,burdandrei/nomad,barnardb/nomad,frundh/nomad,hashicorp/nomad,hashicorp/nomad,nak3/nomad,diptanu/nomad,kmalec/nomad,achanda/nomad,hooklift/nomad,nak3/nomad,dvusboy/nomad,barnardb/nomad,achanda/nomad,burdandrei/nomad,achanda/nomad,novilabs/nomad,barnardb/nomad,achanda/nomad,nak3/nomad,novilabs/nomad,barnardb/nomad,hooklift/nomad,novilabs/nomad,frundh/nomad,hooklift/nomad,diptanu/nomad,kmalec/nomad,dvusboy/nomad,kmalec/nomad,dvusboy/nomad,novilabs/nomad,Ashald/nomad,nak3/nomad,hooklift/nomad,nak3/nomad,achanda/nomad,frundh/nomad,hooklift/nomad,burdandrei/nomad,diptanu/nomad,hashicorp/nomad,barnardb/nomad,burdandrei/nomad,dvusboy/nomad,nak3/nomad,achanda/nomad,diptanu/nomad,novilabs/nomad,Ashald/nomad,novilabs/nomad,achanda/nomad,barnardb/nomad,nak3/nomad,frundh/nomad,Ashald/nomad,burdandrei/nomad,barnardb/nomad,burdandrei/nomad,diptanu/nomad,dvusboy/nomad,frundh/nomad,burdandrei/nomad,Ashald/nomad,Ashald/nomad,hashicorp/nomad,hooklift/nomad,diptanu/nomad,frundh/nomad,hashicorp/nomad,kmalec/nomad,dvusboy/nomad,dvusboy/nomad,Ashald/nomad,Ashald/nomad,diptanu/nomad,hashicorp/nomad,hooklift/nomad,kmalec/nomad