fixing some tests INCOMPLETE FIX not all test cases use our default ship yet...

Signed-off-by: Tom Fitch <tfitch@ebay.com>