reorganised ships tests