fixed intentional test fail; cleaned up some shippable.yml