Fix Promise Tests and improve OpUtils