Copy over geddy testing changes