Some test changes
And some more changes