Improved tests a little.