Update code and tests to Blaze