Adjusting tests a bit