@zuazo would u mind writing a couple tests for this new functionality?