Improved tests a bit (made mor rigorous)