Fix dynamic block tests now that we have static method refs