Updated tests for generative stuff