Re-enable Boshiamy for testing