Fix shippable tests #48