FIX unit tests in Shippable