Improved tests a bit (made more rigorous)