Updating tests so master builds properly