fixes for test ivy build